From ddd92c21bfe8b511403d434ca29f6194e1adb8ad Mon Sep 17 00:00:00 2001
From: Debian LibreOffice Maintainers <debian-openoffice@lists.debian.org>
Date: Tue, 24 Apr 2018 10:46:54 +0100
Subject: [PATCH] debian-hardened-buildflags-CPPFLAGS

Gbp-Pq: Name debian-hardened-buildflags-CPPFLAGS.diff
---
 config_host.mk.in       |   1 +
 configure.ac            | Bin 451029 -> 451169 bytes
 solenv/gbuild/gbuild.mk |   2 ++
 3 files changed, 3 insertions(+)

diff --git a/config_host.mk.in b/config_host.mk.in
index 4ae4ac73f3c..61ae5a70427 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -77,6 +77,7 @@ export CPPUNIT_CFLAGS=$(gb_SPACE)@CPPUNIT_CFLAGS@
 export CPPUNIT_LIBS=$(gb_SPACE)@CPPUNIT_LIBS@
 export CPUNAME=@CPUNAME@
 export CDEFAULTOPT=@CDEFAULTOPT@
+export HARDEN_CPPFLAGS=@HARDEN_CPPFLAGS@
 export CROSS_COMPILING=@CROSS_COMPILING@
 export CURL=@CURL@
 export CURL_CFLAGS=$(gb_SPACE)@CURL_CFLAGS@
diff --git a/configure.ac b/configure.ac
index 72099f9db9953c54e56437d0536e77061a2fb858..9a589ff074133a7188f9b054bf49ac546de2913f 100644
GIT binary patch
delta 168
zcmcb5So+}+>4p}@7N!>F7M3ln6N>9I(-cZli%S%AD-`rgi;MJ=GV}CP3bNC6lS(sl
zQqpn~(~GSYN-|ROxD+73!!gLk)i2&TAi&MX(LLBU0Zp}nu5Nm2i2_Vs!N^WOCACaH
luQVqofh#SO%h5SLIMgXPL<4LP7s90W-eT76y~S)Ec>wSfH!1)C

delta 34
qcmaEOMEdGs>4p}@7N!>F7M3ln6N;zjm$FK=o0YI`H!ES&&I17UQ4E>@

diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk
index b87f6fc569d..129a5ab7f65 100644
--- a/solenv/gbuild/gbuild.mk
+++ b/solenv/gbuild/gbuild.mk
@@ -238,6 +238,8 @@ gb_GLOBALDEFS += \
 		ENABLE_LTO \
 	)
 
+gb_GLOBALDEFS += $(HARDEN_CPPFLAGS)
+
 gb_GLOBALDEFS := $(sort $(gb_GLOBALDEFS))
 
 # This is used to detect whether LibreOffice is being built (as opposed to building
-- 
2.30.2